Skip to content

Conversation

@reactjs-translation-bot
Copy link
Contributor

This PR was automatically generated.

Merge changes from reactjs.org at 1f2dbb7

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

BrianMitchL and others added 6 commits March 18, 2019 10:24
* Add a DOM measurement recipe to Hooks FAQ

* Update content/docs/hooks-faq.md

Co-Authored-By: gaearon <dan.abramov@gmail.com>

* Update content/docs/hooks-faq.md

Co-Authored-By: gaearon <dan.abramov@gmail.com>
* Add more explanations to API page

* static

* add info about useLayoutEffect

* Update content/docs/hooks-reference.md

Co-Authored-By: gaearon <dan.abramov@gmail.com>

* nits

* nit
* Update languages for Simplified Chinese completion

* Update languages.yml
@netlify
Copy link

netlify bot commented Mar 22, 2019

Deploy preview for ru-reactjs ready!

Built with commit ce39f1d

https://deploy-preview-285--ru-reactjs.netlify.com

@gcor
Copy link
Collaborator

gcor commented Mar 23, 2019

#286

@gcor
Copy link
Collaborator

gcor commented Apr 1, 2019

@ntishkevich посмотришь этот реквест?
Я перевод сделал в #286 реквесте (там же английский оригинал) и сюда притянул, не знаю нормально ли это или нет.

Copy link
Member

@lex111 lex111 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gcor спасибо за обновление! Можно смело править мои предложения или вносить изменения, т.е. не ждать моей реакции, чтобы как можно быстрее принять это обновление, потому что итак сильно затянули.

lex111 and others added 6 commits April 2, 2019 09:53
Co-Authored-By: gcor <anton@gcor.ru>
Co-Authored-By: gcor <anton@gcor.ru>
Co-Authored-By: gcor <anton@gcor.ru>
Co-Authored-By: gcor <anton@gcor.ru>
Co-Authored-By: gcor <anton@gcor.ru>
Co-Authored-By: gcor <anton@gcor.ru>
lex111 and others added 6 commits April 2, 2019 09:54
@gcor gcor merged commit 9c6f689 into master Apr 2, 2019
@lex111 lex111 deleted the sync-1f2dbb7a branch April 2, 2019 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants